Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Remove the usage of pkg_resources + add debugging instructions #2375

Merged
merged 2 commits into from
Dec 2, 2024

Conversation

rochacbruno
Copy link
Member

What is this PR doing:

  • Removing deprecated pkg_resources
  • Adding debugging settings to compose files
  • Running devinstall earlier to allow debugging with breakpoints
  • Add instructions to compose README on how to debug using *pdb

@github-actions github-actions bot added backport-4.9 This PR should be backported to stable-4.9 (2.4) backport-4.10 labels Nov 29, 2024
@rochacbruno rochacbruno added backport-4.10 and removed backport-4.9 This PR should be backported to stable-4.9 (2.4) backport-4.10 labels Nov 29, 2024
@rochacbruno rochacbruno force-pushed the remove_pkg_resources branch 2 times, most recently from 06404a5 to ab1ae9b Compare November 29, 2024 22:55
Copy link

sonarcloud bot commented Nov 29, 2024

@rochacbruno rochacbruno merged commit ed0ef4e into ansible:master Dec 2, 2024
18 of 21 checks passed
@rochacbruno rochacbruno deleted the remove_pkg_resources branch December 2, 2024 13:42
Copy link

patchback bot commented Dec 2, 2024

Backport to stable-4.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply ed0ef4e on top of patchback/backports/stable-4.10/ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd/pr-2375

Backporting merged PR #2375 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/galaxy_ng.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4.10/ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd/pr-2375 upstream/stable-4.10
  4. Now, cherry-pick PR fix: Remove the usage of pkg_resources + add debugging instructions #2375 contents into that branch:
    $ git cherry-pick -x ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd
    If it'll yell at you with something like fatal: Commit ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR fix: Remove the usage of pkg_resources + add debugging instructions #2375 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.10/ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd/pr-2375
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants